81d8f7f915cd5727ae00b82fbb64872e5f746ab6,oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/CommitCommand.java,CommitCommand,mergeNodes,#,157
Before Change
if (existingNode.getPath().equals(committingNode.getPath())) {
logger.debug(String.format("Found existing node to merge: %s", existingNode.getPath()));
logger.debug(String.format("Existing node: %s", existingNode));
logger.debug(String.format("Committing node: %s", committingNode));
Map<String, Object> existingProperties = existingNode.getProperties();
if (!existingProperties.isEmpty()) {
committingNode.setProperties(existingProperties);
logger.debug(String.format("Merged properties for %s: %s", existingNode.getPath(),
existingProperties));
}
List<String> existingChildren = existingNode.getChildren();
if (existingChildren != null) {
committingNode.setChildren(existingChildren);
logger.debug(String.format("Merged children for %s: %s", existingNode.getPath(), existingChildren));
}
committingNode.setBaseRevisionId(existingNode.getRevisionId());
logger.debug(String.format("Merged node for %s: %s", existingNode.getPath(), committingNode));
break;
}
After Change
}
private void mergeNodes() {
for (MongoNode existingNode : existingNodes) {
for (MongoNode committingNode : nodes) {
if (existingNode.getPath().equals(committingNode.getPath())) {
if(logger.isDebugEnabled()){
logger.debug("Found existing node to merge: {}", existingNode.getPath());
logger.debug("Existing node: {}", existingNode);
logger.debug("Committing node: {}", committingNode);
}
Map<String, Object> existingProperties = existingNode.getProperties();
if (!existingProperties.isEmpty()) {
committingNode.setProperties(existingProperties);
logger.debug("Merged properties for {}: {}", existingNode.getPath(),
existingProperties);
}
List<String> existingChildren = existingNode.getChildren();
if (existingChildren != null) {
committingNode.setChildren(existingChildren);
logger.debug("Merged children for {}: {}", existingNode.getPath(), existingChildren);
}
committingNode.setBaseRevisionId(existingNode.getRevisionId());
logger.debug("Merged node for {}: {}", existingNode.getPath(), committingNode);
break;
}